Merge remote-tracking branch 'origin/master' into feature/android

author Po Lu <luangruo@yahoo.com>

Mon, 27 Mar 2023 08:43:07 +0000 (16:43 +0800)

committer Po Lu <luangruo@yahoo.com>

Mon, 27 Mar 2023 08:43:07 +0000 (16:43 +0800)
author Po Lu <luangruo@yahoo.com>
Mon, 27 Mar 2023 08:43:07 +0000 (16:43 +0800)
committer Po Lu <luangruo@yahoo.com>
Mon, 27 Mar 2023 08:43:07 +0000 (16:43 +0800)
diff --cc configure.ac
Simple merge
diff --cc etc/NEWS
Simple merge
diff --cc lisp/term.el
Simple merge
diff --cc src/buffer.c
Simple merge
diff --cc src/xdisp.c
Simple merge
author	Po Lu <luangruo@yahoo.com>
	Mon, 27 Mar 2023 08:43:07 +0000 (16:43 +0800)
committer	Po Lu <luangruo@yahoo.com>
	Mon, 27 Mar 2023 08:43:07 +0000 (16:43 +0800)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
etc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/term.el	patch \|	diff1 \|	diff2 \|	blob \| history
src/buffer.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	patch \|	diff1 \|	diff2 \|	blob \| history